Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / domain / HouseFeatures.java

diff --git a/ruralHouses client/src/domain/HouseFeatures.java b/ruralHouses client/src/domain/HouseFeatures.java
new file mode 100644 (file)
index 0000000..e79a446
--- /dev/null
+++ b/ruralHouses client/src/domain/HouseFeatures.java
@@ -0,0 +1,67 @@
+package domain;
+
+import java.io.Serializable;
+
+public class HouseFeatures implements Serializable {
+
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
+       private int nRooms;
+       private int nKitchens;
+       private int nBaths;
+       private int nLivings;
+       private int nParkings;
+
+       public HouseFeatures(int nRooms, int nKitchens, int nBaths, int nLivings,
+                       int nParkings) {
+               super();
+               this.setnRooms(nRooms);
+               this.setnKitchens(nKitchens);
+               this.setnBaths(nBaths);
+               this.setnLivings(nLivings);
+               this.setnParkings(nParkings);
+       }
+
+       public int getnRooms() {
+               return nRooms;
+       }
+
+       public void setnRooms(int nRooms) {
+               this.nRooms = nRooms;
+       }
+
+       public int getnKitchens() {
+               return nKitchens;
+       }
+
+       public void setnKitchens(int nKitchens) {
+               this.nKitchens = nKitchens;
+       }
+
+       public int getnBaths() {
+               return nBaths;
+       }
+
+       public void setnBaths(int nBaths) {
+               this.nBaths = nBaths;
+       }
+
+       public int getnLivings() {
+               return nLivings;
+       }
+
+       public void setnLivings(int nLivings) {
+               this.nLivings = nLivings;
+       }
+
+       public int getnParkings() {
+               return nParkings;
+       }
+
+       public void setnParkings(int nParkings) {
+               this.nParkings = nParkings;
+       }
+
+}